merge trunk
authorK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:25:41 +0000 (23:25 +0900)
committerK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:25:41 +0000 (23:25 +0900)
commit15982454a8e5a907892f9c8cf3653edcc848c349
tree2a89f6179a716f260de7f4f7ff62a15d0e6fcbb2
parenta910de1960f7c2e2d6a9359d03a71e4de5991f67
parentab44406f85604a381f12f5ca91874731f64815b8
merge trunk